The Electricity Market Design Revision